Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Wed, 28 Mar 2007 15:04:14 +0000 (15:04 +0000)
committerTim Deegan <Tim.Deegan@xensource.com>
Wed, 28 Mar 2007 15:04:14 +0000 (15:04 +0000)

Trivial merge